From: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>
Date: Fri, 12 Sep 2014 11:09:43 +0000 (+0530)
Subject: xen/arm: Calculate irq rank from irq number
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4420
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=5cf5289622d03ea3af5d6ca7a3b325fa4ce0b286;p=xen.git

xen/arm: Calculate irq rank from irq number

irq rank calculated is not generic and assumes
hardware register size value which does not work
for future GIC versions like V3.

Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 1372ffc994..c6e9479908 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -31,6 +31,16 @@
 #include <asm/gic.h>
 #include <asm/vgic.h>
 
+static inline struct vgic_irq_rank *vgic_get_rank(struct vcpu *v, int rank)
+{
+    if ( rank == 0 )
+        return v->arch.vgic.private_irqs;
+    else if ( rank <= DOMAIN_NR_RANKS(v->domain) )
+        return &v->domain->arch.vgic.shared_irqs[rank - 1];
+    else
+        return NULL;
+}
+
 /*
  * Returns rank corresponding to a GICD_<FOO><n> register for
  * GICD_<FOO> with <b>-bits-per-interrupt.
@@ -40,17 +50,14 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n,
 {
     int rank = REG_RANK_NR(b, (n >> s));
 
-    if ( rank == 0 )
-        return v->arch.vgic.private_irqs;
-    else if ( rank <= DOMAIN_NR_RANKS(v->domain) )
-        return &v->domain->arch.vgic.shared_irqs[rank - 1];
-    else
-        return NULL;
+    return vgic_get_rank(v, rank);
 }
 
 struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq)
 {
-    return vgic_rank_offset(v, 8, irq, DABT_WORD);
+    int rank = irq/32;
+
+    return vgic_get_rank(v, rank);
 }
 
 int domain_vgic_init(struct domain *d)